Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2011 06:15:12 +0000 (23:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2011 06:15:12 +0000 (23:15 -0700)

Trivial merge